New commits:
commit 9099bb4577febc0a2840588efcca1869d392ade4
Author: Paul Wouters <pwouters at redhat.com>
Date: Thu Jan 12 12:36:15 2017 -0500
revert partial change that accidentally came in from a branch.
This code was never called because it was ifdef'ed but the define
only exists on the branch