Revert 79be76d..e8f4932

This rolls back to commit 79be76d9757e6788cd60133a1ae2b2e32bb66efe.