Reverting Quick fix in favor of a more thorough solution (that needs to be in the model, not the view)
Merge pull request #60 from kobotoolbox/RemovingQuickFix

Reverting Quick fix in favor of a more thorough solution