I think this is not needed as commented in the other PR