Revert 07cedea..ed37291

This rolls back to commit 07cedeac2e61361298528005d10ddb4c4c9752ff.
Revert 767f6b5..7f04188

This rolls back to commit 767f6b55156ffbb5151b2bb88dbf6e4976473794.