Revert to 4.7 toolchain