I didn't do this in my initial patch because it kept breaking the windows build. I'll need to sit down and figure out what's going on but it's probably not worth it right now.