I think it should resolve the problem, yes.  I realize this is probably 
coming long after people stopped having AFS-salted keys to worry about.