Re-apply Firefox disconnect fix, Polyfill methods