Bug 827531 - Revert part of this change due to xpcshell bustage on b2g18