This reverts commit 4f3c8919. It was merged by mistake !12 the HAF part has been not merged yet: haf!645