This option has been deprecated for a long time and any kinks, where they existed, should have long since been worked out. Time to kill it. Change-Id: Ifa686b5ce5e8063a8e5f2f22c89124c1d4083b80