Reverting shindig-1835, it causes test failures

git-svn-id: https://svn.apache.org/repos/asf/shindig/trunk@1445433 13f79535-47bb-0310-9956-ffa450edef68