I intended to implement this one after this CL.