In the middle of addressing pull request comments. This is a safety commit in case I have to revert some changes I'm about to make.
