Revert "Remove unused function after dd37648c"

This reverts commit 766c3bcf0f0554dffe1f916a7ced1de407e47cb9.
Revert "Merge remote-tracking branch 'cm/cm-11.0' into merge_cm"

This reverts commit 5de9960c014e27a5a360dabe6c9a21aa3507a97a, reversing
changes made to ef4f2326e781674ffa16a3801d68ea5752b95464.