Revert 60dfc2e..8c19c42

This rolls back to commit 60dfc2e1d409b2590e78fef1b85d7b2c4fa6ca64.