Remove complex code for handling apple prim id bug

The OSX version that had the issue hit end of life over a year ago. The work around added a lot of complexity.