Revert f971988..31f2afa

This rolls back to commit f9719881f5dd786008dd053e65d4555689ce843a.