Remove fixes committed upstream