Revert b7d0f0c..9605ce1

This rolls back to commit b7d0f0c855799e8584cd825e64362c67ba5fee1b.