Cut back on the replacing a bit

[ci skip]