Revert 0a1bb52..5bc886a

This rolls back to commit 0a1bb5247c74405f3eee9acdfc12362cb0daa714.
Revert 731becf..ce00c6b

This rolls back to commit 731becf2b7bc36b5528a78d30b53710dd80dfb8d.