Update for review.
Tracking here: https://bugzilla.redhat.com/show_bug.cgi?id=1112337