Revert 572d70a..9cd6ea0

This rolls back to commit 572d70a6a5b3f1a84ccfb618083e53570c52ca32.