Revert 7d25696..dac2c00

This rolls back to commit 7d25696340be7cbf0e5d97a6a0ca22d916fc8942.