Doh! I wrote this module I should know how to use it! Change-Id: Iebf8adfc25114a954f843527914cab849935f74f