Reverting SHINDIG-1978 it is breaking unit tests

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