Revert b1970cb..93b39b4

This rolls back to commit b1970cb7e052fcebc30a8be965c2d73bb56e90be.