Partial revert bc034415501
Partial revert bc034415501

Signed-off-by: Joffrey F <2e95f49799afcec0080c0aeb8813776d949e0768@docker.com>

thaJeztah/compose,vdemeester/compose,vdemeester/compose,thaJeztah/compose