It's not completely without regressions, but I believe we can deal with the rest directly on master. This is required for Firefox security fixes.
