modify the previous \password patch to use it instead of depending
on a not-officially-exported function.  Per discussion.