Revert dfc2e3b..91725dc

This rolls back to commit dfc2e3b6fc71a8511b5ec3ea939dc073ee7bd7b6.