This reverts reverting commit fc40a03323 and fixes LLD (MachO/wasm) tests that failed previously.
fc40a03323