Revert e741f7e..705250a

This rolls back to commit e741f7ef6a51cbcfddb9443e5d20be5528f4f985.