reverting dict to be R16 compliant. This will need to change back eventually, but not until we update to >=R17 on all systems