Now normal support also uses this option, so we can't default it to 1, otherwise normal supports will be too hard to remove.
jira: none
Change-Id: Ic5700af5c17e3a7b265c8915f28b0db35c6e06e6
(cherry picked from commit 6b84a9826da108b76569e686bd9def0b23ae29fd)