Revert 5e33203..5271216

This rolls back to commit 5e33203ae0e3ee9e4883116a13ea246306db932e.
Revert 4894d10..ca74829

This rolls back to commit 4894d1067b1411e526ed8674c949f95f9edd5c28.
Revert 5e33203..1deaf5d

This rolls back to commit 5e33203ae0e3ee9e4883116a13ea246306db932e.