This reverts a small part of 3c519949 that deferred execution of maybeDone() to idle. Fixes #2365 Fixes #4098