Revert "Requesting a pull to mozilla:master from k88hudson:1029528"

Reverts mozilla/makerparty#26