tibbs pushed to cyrus-imapd (master). "OK, just avoid __isa_bits."