This reverts commit b5e352e5.

GCC4.8 doesn't like the combination of a scoped enum and
storing such a type in a bitfield. And it has a bug
(still present in its current master) which prevents us from
suppressing the warning nicely.

Change-Id: I8c73e4c5175cfc43a1b8251ad85d262ad89c4f4d