Revert e995ba9..203c11b

This rolls back to commit e995ba9e6ee1670c96af8d0bc22da7e9b6fb358b.