SHINDIG-1965 | Reverting original patch.

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