partial MFC of r256114:
add missing sections, de-Xr non-existent page