Revert "Merge pull request #889 from code-dot-org/feedback_collect"

This reverts commit 2256e0f2c939e6e7ac1a660616b360a627c63874, reversing
changes made to 9c98bae611f21d1bbae5029849f081e5420502e1.
Revert "Merge pull request #776 from code-dot-org/feedback_collect"

This reverts commit 9c98bae611f21d1bbae5029849f081e5420502e1, reversing
changes made to 99dffacfcf8c77ae7999428e9e395e63c5cef80d.