In #6494 I tried to do this, but the key was wrong. Do it again with more testing before it gets merged.
