Revert 72c067d..d946846

This rolls back to commit 72c067db1635f8166350b54a934d48e9daad6ab5.