This will establish a baseline for the changes from #36363. Testing: New tests in CI. Fixes: Part of #4577 Signed-off-by: Josh Matthews <josh@joshmatthews.net>