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