Revert 1ff3026..0c99587

This rolls back to commit 1ff30266cd6f884cd16005ce7064c3b4fde8f992.
Revert 0c99587..4989013

This rolls back to commit 0c9958779480b35ef0ae3d2820817e1cfb6e6258.