Revert "Merge pull request #22 from yor-mozilla-com/fix959400"

This reverts commit a1b1a4488c966757e56d6028bdb4d2850f537ea6, reversing
changes made to 682944a31f28255ae3eb30cb11281f48743d1f6f.