Revert "Disable the xorg-x11-server-utils patch for now"
    
    This reverts commit fa29e594eea69921b282fc9960196217d44b2e7c, so
    we get a build with both the fix for report-cli and the changes
    for the xorg-x11-server-utils split. I will edit this build into
    that update.