Solve weird dependency issues with composer

Change-Id: I4585d9545bf397f11eae064ba5f1d057835da116