Revert 58f0081..e332172

This rolls back to commit 58f0081c2d638ef83215fcffb916f5979b0c3707.