Revert "Composer fixes"

This reverts commit c7ca9066ef8985378b2c6fb5c84f2a61241ab8db.