Semi-revert 4.8 toolchain
Signed-off-by: PipelinerArd <kristoferard@gmail.com>