Revert 64ee24a..9a5120c

This rolls back to commit 64ee24a2c9ef79859184c1b365b2872c65d988b2.