I think commenting this out is not needed anymore. diff