* Back on 14.1 the planned additions for this never
  actually panned out, and it's been vestigially
  carried forward since then.

Change-Id: I94c6ce7f6d8873b33b1c73849bffb259552f9759