revert r315841, MFC of r315083: not applicable to this branch
And it broke the build too.
Reported by: lwhsu