This reverts commit 2b48fcc607010065c0f8107baf669dd41b164f3c. It introduced a regression (#20777) which we can't easily fix in 1.6.
This was a stealth option only used by the tests, and it isn't useful any more since `atomic` provides nested transactions. Backport of 2c40681 from master.