repatched non-collection prototypes