Team Fortress 2 Sniper and Spy Achievements

I've just noticed that Valve have put back the old way of getting unlocks through achievements with a small change. The Sniper and Spy unlocks are got at 5, 11 and 17 achievements whereas the Medic, Heavy, Scout and Pyro are 10, 16 and 22.

Valve, if you're going to change the unlocks like this then change the older unlocks to match the new way.