Remove remapping subkeys for now until there's a need.