This reverts commits 1c811dbc82, 146810a3e9, 9508ed45df, a6fb945120.
1c811dbc82
146810a3e9
9508ed45df
a6fb945120