Revert 392c525..73289ad

This rolls back to commit 392c525f5bf3ae6e727ab45f3a0a57604e1d15a5.
Revert b723f01..0cccc1a

This rolls back to commit b723f018a006baa6ae455a3439ba0301906fad93.