Address https://github.com/mozilla/olympia/pull/165#issuecomment-51178081