Revert 7210241..944c326

This rolls back to commit 7210241b1cb6eeb94a2ba6c2517939d360db34bc.