Resolving a conflict caused by merging into the wrong branch.
Fixes that make it work in latest Firefox since I kind of forgot to do that.