Fix botched patch application