Attempting to get this working on OS X again.