Revert "Fix 100% cpu usage on osx bug"