Applying b98375f9 instead of 9b32e4b1 for version 10.5-10.8.
Applying 5075f4e0 instead of 9b32e4b1 for version 10.9+.