Revert 7953f1b..7ff9920

This rolls back to commit 7953f1b041582f4fa6d449312af3b2af1cd65084.