nononono

Simply use the upstream version + your patch.