Changes

Technically, the following two commits are not BFB

BIT_CHANGING:a36b7a66d8742e772953fb745dcfb8243120412b
BIT_CHANGING:9371045e8739a4412dbe93f8948aacc9682d4852

but the latter code change undoes the bit-changing effects of the former, and so the net effect is nil.