This reverts commit c66c077d. Reason for revert: Problem with preceding CL fixed. Test: mma -j40 test-art-host