This change did not have the intended effect because keys with normal salts generally have key_data_ver == 1, which causes the switch statement to be bypassed. r25410 (currently slated for 1.11) finally does what this change was intended to.