Commented out new #defines in Configuration.h.