Revert 2 patches from 3.14 to fix the radeon build