We landed nodejs/node#6023 to fix nodejs/node#5820

This has created a regression that has had two different issues opened

nodejs/node#7159
nodejs/node#7278

There is a potential fix, but it has not yet lived in a release, and may not covered one of the edge cases mentioned in nodejs/node#7278

I think that it might be wise to revert nodejs/node#6023 in the next release.