Revert e79411d..3cf2ca4

This rolls back to commit e79411d8012158f7232976d3b107fb6710364653.