Revert 053a0d4..b2c72ee

This rolls back to commit 053a0d417a9801340bcf09269d4e53344c3329ae.