Simplify previous patch.