I've filed mozilla/browserid#3464 to let us kill this :)