Default back to type on protocol. fix #2120