Remove unintend change to capability.h from r344530

I expect to remove capability.h in the near future, but it should not
have been part of this commit.