LPS-41717 Ray preferred this fix, because it makes it obvious why we are doing the search and replace