Note that we will be dropping the "protocol" lines sooner or later

(See ticket #13593)