Revert strace hiccups fix.

This reverts commit 40138249 and
ffa9009c

.

There are problems with how the flag bytes were rearranged, in
particular we really can't move values down into the lowest
16 bits since those are used for individual state bits.

Signed-off-by: David S. Miller <davem@davemloft.net>