ZEN-11959. Only remove if BOM marker is present