Revert a1f148a..55ee8ec

This rolls back to commit a1f148a928e56330389069c88c6610973e4b2aa9.
Revert 5afa27c..07471ce

This rolls back to commit 5afa27cfb6909a0d463acbf63404b7182c1ed869.
Revert 7a077c4..b7534a5

This rolls back to commit 7a077c4dd33f57a229ac2ca34fc65f037003a0a8.