ran cruft update and manually edited in rejected changes

[zzstoatzz]

I accidentally polluted the history of the auto generated PR syncing with collection template so I just did this manually