Revert #7755
Revert #7755

nicolas-grekas/composer,pierredup/composer,floverdevel/composer,slbmeh/composer,staabm/composer,johnstevenson/composer,milleruk/composer,stof/composer,composer/composer,alcohol/composer,andrerom/composer,localheinz/composer,fabpot/composer,naderman/composer,stefangr/composer