Turn this off by default.

Not a good idea to make a "legacy" behavior on by default.

Change-Id: Ib9f211dd57e3223b98f2ba6a076b05364b50ed48