Note to self:

> This can be done before we copy the property list.

… still applies