Restore 'X' from bad cherry-pick in 581e393538