Yes, but this is just copied from the Node code; I'm not going to update that and the clients as a part of this checkin.