Hm. Everything now builds even with this removed. I'm re-pushing to ensure it still builds on Linux too.