Details here: https://github.com/nodejs/node/pull/21936#issuecomment-409649872; pulled out as a separate issue so that we can discuss the changes and reference it in a pull request.