Bug 835963 - Revert pull request 68 due to bustage
Merge pull request #69 from dhylands/dhylands-835963

Bug 835963 - Revert pull request 68 due to bustage. r=mwu