Revert simplifying override descriptor - we'll need to clear volatile attribs on override set/delete, and simple doesn't let us to do so