Hurray!  Yubipam is fixed!

This reverts commit b0f2d8a5c582e845df89292f8b3e217ea64845a9.