TO-UNDO: failed test switching off legacy mode always
Revert "TO-UNDO: failed test switching off legacy mode always"

This reverts commit 398a2c40a3761012b35bff4e3dadff1289ce2764.
wip