Revert ce2d298..dcea7da

This rolls back to commit ce2d2988d0f2e07db8c8a19d67c9739c53ac922d.