Revert to old version because it doesn't break preprocessor