Ooops revert stuff which shouldn't have been part of previous commit.