I think this CL makes the docs change unnecessary, no?