Revert 2b3f8af2 as soon as LbEnv!85 is deployed