Revert b37ae3f..c2ea861

This rolls back to commit b37ae3fd670e2c14dc7699e192d93fc8f264973a.