Merge "Fix RemexCompatMunger infinite recursion"