Reverted code change as it is causing test failures

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