Reenable workaround for composer regression