Forgot to remove some bits in previous commit.