This reimplements the good changes from #5840. Co-Authored-By: Kevin Kirsche <kevin.kirsche@one.verizon.com>
