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

This reverts commit 3059d4dcd90e693b00b8ccf042c84294c9dc994c, reversing
changes made to 682944a31f28255ae3eb30cb11281f48743d1f6f.