Revert b62a1bf..8f9627a

This rolls back to commit b62a1bfbb5b0066171e9a330a007336a99aba1cb.