remove ClientData (bug 996247)
Merge pull request #2073 from andymckay/996247

remove ClientData (bug 996247)