Revert r273481 so it can be recoded using fls(), which
some feel will make it more readable.