Fix errors caused by wrong rebasing

The conversion of self.ENABLED ot states.ENABLED got mixed up in
a following commit. Just a commit to repair that stuff.

Change-Id: I4ab4c6b35dc04d281f52184f035e86c15b269044