Bundle upstream, not my patches :(