Fixes a deadlock caused by commit
31ab78ae.  That commit was not
actually bad - just these two calls have always been bad, which went
unnoticed for a long time.