Revert fb56817..afd6f61

This rolls back to commit fb56817895bcd561b573ccfeceedb986be9a84f0.
Revert 8f2745c..f292211

This rolls back to commit 8f2745c248529587e24b6a30501192e705dffbd9.
Revert a6b35f3..320ebe4

This rolls back to commit a6b35f3a2216fba71dd42e9310adf718c59bd351.