Revert 0cd790a..03c2831

This rolls back to commit 0cd790a27489499a7d909c684cb895a07f239781.
Revert 213d77e..b883f4c

This rolls back to commit 213d77e5a76c87f3eaadfb113988c25dfaf6e204.