Fixes #2389 -- strip the BOM for once and for all