Simplify logic by relying on new sprocketeer functionality