Revert ec88222..2f444a2

This rolls back to commit ec882227daa986bcbb23ef83939621d7ca2b1069.