This reverts commit e930237f61. Unbelievably, that worked, somehow the preprocessed file had gotten cached from the wrong version. Windows has found a new way to amaze me in its horribleness.
e930237f61