Reverted OSX hack to shutdown window provider