revert and composer fix