Argh! Should. Test. Stuff. Removing patch chunk that upstream incorporated already