This reverts commit ec57b21a92. A which-key change caused issues with this fix. And the fix doesn't seem to be needed anymore. The correct which-key entries appear without the fix.
ec57b21a92