Comment 3 for bug 2008904

Thanks, again, Josh!

I cleaned up some whitespace and squashed it into 1 commit and pushed it to main.

The new feature works for me and doesn't have any issues with a system using a legacy configuration.