Revert e7e9053..e8e81e2

This rolls back to commit e7e9053c8e0f7dc7d4f70567d7794f40fbe9f58d.