Partially removed patches for ATL thunk fixes (accepted upstream).