Revert e244e54..516a5e6

This rolls back to commit e244e549ab1270c140682cb2a70a2e344ba46298.