#86 -- Disabled BOM handling fix for now, although left code in case needed in future.