possibly we could just leave `setdefault` here so it's easier to revert when the time comes? or maybe just add a comment about it (or create a trac ticket with instructions)