Revert "Merging osxKIF"

This reverts commit 9bc04d8d801699b888ce5dc98dd2898bcb5bc0ff, reversing
changes made to 3f78960e6d59daead8dcfd3efce076babcc7b219.