e6f3252d did not remove the include and commented it only instead, even though it is not needed anymore.