Merge "Revert "Faster and simpler replace in SSB""