Revert e72df8e..cab4ee2

This rolls back to commit e72df8e27235da83a51e7f19cf995886c892b508.