Reverting to manually generated protocol buffer files as they are causing too much trouble