Refs #800 (Fix fatal-isolation test in master branch)

* Synced with 6937c46.