This reverts commit 859ebca744. The change contained many unrelated changes and e.g. restored unit test failes for the old lld port.
859ebca744