Revert "Regen descriptor protobuffs to be compatible with 2.5"

This reverts commit 9f7bfe29ca83533cf1241afd119537af0cbe3c23.