I realize that this isn't being changed as part of this PR, but It would be nice if there were a test covering this.