Remove upstream fixes
awffull: fixed upstream