More reversion of OSX hacks