Closes #38825

Comment From: wilkinsona

Unfortunately, this change isn't what was described in the issue. I also don't think we're ready to implement anything just yet as we have some design to figure out first. Thanks anyway for the PR.