Revert "2014-09-17 csp assignments"

This reverts commit 246caed61f6dbe11591070b44aab361c1a0d6ed6.