Revert !573 (merged) which caused the exact KeyError it tried to prevent. The keys were correct before !573 (merged).