Revert b2841df..905d8e1

This rolls back to commit b2841df41a7c63650240f014c3170e70f961553c.