restore returned on time scope
remove .all..?
Merge pull request #812 from YaleSTC/809_returned_on_time

restore returned on time scope