Late break-in patch for MacOS support.