so, this codepath used to use a loophole that i wanted to close.