Revert e076cbf..040b8e3

This rolls back to commit e076cbf904b30fb196bba599e19149a967c23fd4.