macosx: same as previous commit plus revert of [24799] for prefs.m (unintended commit)