Oh, the early days, when people thought .htpasswd was a good idea. There is a special place in hell reserved for those who invented them.

Let's get this cleaned up before merging this mainline.