We should seriously consider getting rid of v4server and v5passwdd after 1.3.