We can debate whether it is necessary in another PR. Please take it out of this one.