This reverts commit 05f87557. Seems to be causing issues with macOS for certain apps, reverting for now.