Revert 24d63f8..d42cf28

This rolls back to commit 24d63f8deb52e627510cc0944fa30c13f2e2de4e.