Re-apply 2.15 cross patch from Gentoo