MFC: r251368, r251382: Match the options of the kernel.