resolving revert conflict
Merge pull request #36 from mozilla/revert_pull_request_34

resolving revert conflict