Revert 667c875..a740dcd

This rolls back to commit 667c875ad44178221dba30dc19e0e03d4a2eca1f.