Revert fb7e56c..407f663

This rolls back to commit fb7e56c5fc6c05629fd29cea199bf8d6d0e64172.
Revert 0250f72..750b30c

This rolls back to commit 0250f7260de5026ce27b418db013f8d7e2663e9b.
Revert ea3412e..b8529ed

This rolls back to commit ea3412ee92eaa96b5aba6a76f49c965000e70bd8.