Revert e7196d7..1aba0e8

This rolls back to commit e7196d764f9c0ae4dfc053bf06ad27b237b7dbc3.