Fix patch context for new upstream