Revert a4f7e82..74411ee

This rolls back to commit a4f7e826c6b285a9bde1bdf213626d2074edc5d8.