undo protocol-buffers related changes that shouldn't have landed on master