Fix for #16455

This reverts saltstack/salt@5fdd866d12451eb765f808d7e0cdfbd2f5bdd210, which introduced a self-referential dictionary-- which mean that it could never be garbage collected.