Revert cd2597e..0a01b2a

This rolls back to commit cd2597e8a910a42dc1d5d3a71a9117f42f3521db.