49d6a6ed8d
This commit is specifically designed to avoid a mass rebuild. I'll make a follow-up PR to staging which will make the patches unconditional, etc. Co-Authored-By: Weijia Wang <9713184+wegank@users.noreply.github.com>