I think this change will cause a break on fennec, anyhow I think it'd be better to leave this refactoring to another bug.