Back out part of 374a3e136c because it breaks our ability to pass -D defines into code

We need this to pass the built version into the sketch when doing
official builds

bin/kaleidoscope-builder

@@ -145,6 +145,7 @@ compile () {
 		    ${EXTRA_BUILDER_ARGS} \
 		    -build-path "${BUILD_PATH}" \
 		    -ide-version "${ARDUINO_IDE_VERSION}" \
+		    -prefs "compiler.cpp.extra_flags=-std=c++11 -Woverloaded-virtual -Wno-unused-parameter -Wno-unused-variable -Wno-ignored-qualifiers ${ARDUINO_CFLAGS} ${LOCAL_CFLAGS}" \
 		    -warnings all \
         ${ARDUINO_VERBOSE} \
 		    ${ARDUINO_AVR_GCC_PREFIX_PARAM} \