Revert 70367f5..cccc85a

This rolls back to commit 70367f504f41c2b1c2c6492d46c1837b0e110285.