With the fixing of the bug that caused CPPFLAGS to get tromped on, remove