Revert from [WIP] Composer import