Revert b8e3c1e..57b87fe

This rolls back to commit b8e3c1e05e0fd1020988c9e487f21ff6b73e0492.