Revert 88c96e7..efba6bb

This rolls back to commit 88c96e7f3f2735f42eedfe194fe9e2cf1be4d277.