Re-enable OS X support