Revert the removal of the alreadyWaiting peice of code.

This is sometimes a case where the model hasn't finished initializing
yet.