Fix FX18 and below (for good this time) (bug 871490)