b255fbc Fix mistakes during rebase

Authored and Committed by cqi 5 years ago
    Fix mistakes during rebase
    
    Some old code was added back, which is fixed in this commit.
    
    Signed-off-by: Chenxiong Qi <cqi@redhat.com>
    
        
file modified
+0 -6