Note that this will still not work on the client side; the followup CL for the client side is right after this one.