Partial revert of be191879c24a to bring the convenience method back.
Merge bug26070.