this can be done without a custom dict (also fixes #12544)
1 file changed