The improvements that has been added in 7d31061256a02f495b162d04439d14d25e4fc32e doesn't work in Safari 11.1.1 (13605.2.8), while it works in Firefox.