This reverts commit 60aedadc. Using tests from #71212 I am now unable to reproduce there being issues with starting the default metacity flashback session without this.
