Change on_success to always
Revert on_success to never