Oh, didn't realize it's moved code. I'll merge.