Remove bug fix merged from upstream that conflicts with our own bugfix