Revert 33120eb..e956024

This rolls back to commit 33120eb7c6c0958390f1179b29793315344c0c26.
Revert 2c10bef..abed2dd

This rolls back to commit 2c10bef336dd72f1eb69297b08128e7e75f7ab30.