revert and reduce patch to the minimum