Revert fbe2383..f1861e2

This rolls back to commit fbe2383b638e334d34890f2102fa820cb9571af7.