Reverting changes that are in fact incorrect

https://github.com/mozilla/openbadges/issues/543 would suggest I guess wrong the first time!