[f20-branch][rhel7-branch] fixup for an earlier patch