Bug 44210: Drop disableNormalModeByDefault setting. This setting is not
useful, because it (1) is not changeable by the user and (2) it just adds
complexity to the original patch to disable normal mode.

Bug 44210: [EXTRA] Drop test changes from original patch. These test
changes justse rebase conflicts. We are not running these tests yet.
Let's drop it for now and deal with it when we decide to run the tests
-- if we do.