Back out preprocessor changes

In light of #2.