Revert part of previous
Use more generic data and ref.id from newer strider-git version