Revert 7f7d9bf..0b3cb7a

This rolls back to commit 7f7d9bf6a329d249d3d1b82dd0fa23460e3ae7db.