af703e7376
This should have been removed in '6ef30d5', but was missed as it used a different name to the other opts. Change-Id: I85cb86e0c203967da544750a9e52b207f707e8e5