Remove dupe with patch because upstream did the same