Revert "Possible fix for #833: Partially preprocessing files not working"

This reverts commit 0dda7f55ac91c699bc042d607b53c125f65f3faf.
Fix preprocessing bug with definitions.