[3.8] Remove dependency on convert and composite binaries