Revert 4894d10..f151af2

This rolls back to commit 4894d1067b1411e526ed8674c949f95f9edd5c28.
Revert f151af2..8e01427

This rolls back to commit f151af22f3d5eb624c9cc6914a765f527385a0fa.
Revert 5e33203..df13cc2

This rolls back to commit 5e33203ae0e3ee9e4883116a13ea246306db932e.