This isn't my change. Commitwise, it may have gotten assigned to me as I had to resolve a merge conflict here.