IIRC I deleted this in another branch, possibly in qa/1.x - just FYI in case you get a merge conflict from it.