Pull out the on_success, hopefully this patches assembly info properly