REVIEW-4085: Put test setup into its original state. Can't seem to figure out why it fails in the CI build.