Revert "Merge pull request #1108 from ifreecarve/2013-05-21_deployment_csp"

This reverts commit 511e33cb50f793f7e6ea061e8704237f78befad3, reversing
changes made to 9186aa6d7856e5757bfa99852d294d7352e3899b.