Also remove description block, it was removed in 8.5,
according to the output of:
git log -S description-block master --source