Reverted "N/A: Changed AfterDuration stop strategy to use should_stop common utility."
Reverted "N/A: Changed AfterDuration stop strategy to use should_stop common utility."

This reverts commit fa42748ce3831bd9f21f6e85b45e8ec9ec503ea6.

dnguyen0304/clare,dnguyen0304/clare