Backed out changeset db13e1fbc642 (bug 691151) because some in-tree callers are still using the function