Reverting commits that touch protocol

Development of the new protocol will be in branch "new-protocol".