Reverted r54215, breaks captcha