Revert cc7cb56..79e2a5a

This rolls back to commit cc7cb56da92928cf1ba9b4bd011e4486aae978cf.
Revert "Revert cc7cb56..79e2a5a"

This reverts commit 70f31c7a9bb067800ea085f52a1e37e7266e2767.