Revert 7082

This reverts PR #7082 completely. #7082 was landed too fast and did not have sufficient review time (under 10 hours instead of 48).

That PR also broke some things (testcases will follow in a separate PR).

/cc @bnoordhuis @trevnorris @jasnell /cc @nodejs/ctc