Simplify earlier patch