Actually, this guy isn't referenced anywhere yet, I don't think...I know I had to change a bunch of them over on the 1.7 branch. I'll nuke this guy for now and see what's what over on 1.7.