Reverted e671bfc150dd0a556f3eca344526b5eb7696ee1a: OS X builds differently