Revert b8705fa..bab7bc0

This rolls back to commit b8705fa2d2a2888cb92ff801c80d8b94aa810de5.