This reverts commit 95ee14e4379c5e19c0897c872350570402014742.Mikael Petterson <mikpe@it.uu.se> reported that at least one of hissystems will not boot as a result. We have ruled out the detectionalgorithm malfunctioning, so it is not a matter of producing theincorrect bitmasks; rather, something in the application of themfails.