Can we roll this into protocol.h?