Fixing merge

Fixing what looks like a bad merge for the OS X stuff that caused a
build break.