Removed need for Yosemite special handling at this level