Simplify the patch to a single function since there's no known use for
the more general internal version.