Don't use generic timeout, instead check for returned minions.

Closes #12655