Incorporate https://github.com/slightlyoff/ServiceWorker/commit/846d40844d4a8786d690f87837dfdae3ebccffb3