Revert f5e52ec..f4aa24c

This rolls back to commit f5e52ecc56400651deaab358b1bc276a8ad1fe1d.