fix hfs+ (broken by a merge in 7481)