Bug 835963 - Revert pull request 26 due to bustage
Merge pull request #27 from dhylands/dhylands-835963

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