Un-set changes for 4.8 toolchain.  Reverting to 4.7

Signed-off-by: Randy DuCharme <radio.ad5gb@gmail.com>