Revert 736d2df..f30fe05

This rolls back to commit 736d2df75c13a69e6cbdc1355f829752976cc1e7.