Changed Yosemite workaround to a more generic solution.