Fixing 10.8 and later-only behavior.