Backout re-encoding from 10711, since it's done in send_redirect now.
Fix imports in datasets controller, removing *s
Dataset controller: log needed to exist just post import; this was previously using log from one of the * imports...
Datasets controller, fix misc invalid references and function calls.
Strip unused code/vars from datasets controller
merge