Can we get a test for this bit of logic around the backward compatibility? If we're going to maintain backwards compatibility, I'd like to make sure we don't break it.

Not a blocker, so I think I'll go ahead and merge this, but it's something that would be nice to have for later. :smiley: