I thought that I fixed this issue, but I guess that when I was going through taking out the changes relating to the new interface for password encoder, I accidentally took this out as well. I can fix this, and amend the commit.