Revert "Combine bit test + conditional or into simple math"

It is causing stage2 builds to fail, let's get them running again.