Revert "Merge branch '3800_Fix_CSRF_issues' into stable"

This reverts commit 3dc84305b8d7b9e5ecb67011a59fe696a646e0a6, reversing
changes made to 6c24b519f4aabb8db4e1a18b758582042a9e5426.

Change-Id: I6098bc2d8a85246c28ce7687a97dccbd5b4c424b