Remove automagic string replacement fix