This reverts commit cd8843f8. Originally disabled to try to unstick the AMD build bot, didn't make a difference after a week so it goes back in.