Change I4657d46d27ecfc45299d398cd2f3848fbc64b5b5 skipped this.
Change Ib9f9a8bc6720ca8e1b916b2fa1583982859b08ae unskipped it.
But some things fell out while we were shaking the code.
Change-Id: I0164582af81daf49b7391944940d2f8c187a9d42
Was-Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
Rebased-by: Pete Zaitcev <zaitcev@redhat.com>
4c0d0f8e98