Revert "Merge branch 'master' into baytrail"
    
    This reverts commit 7511bcf2e6ddc31ee27418487f2d4b7d93bed1e2, reversing
    changes made to cd44fa829c5e8255bf623a4b072cf85bb61b3092.
    
    This should get the tree back to the state it was before the errant push.
    The history will be ugly because Fedora disallows force pushing (sigh), but
    oh well.