Revert e74d604..afba97d

This rolls back to commit e74d60453b9d779025998be3d1ec64dd52221727.