This reverts commit 4f3c8919. It was merged by mistake !12 the HAF part has been not merged yet: haf!645
mentioned in commit f953a319
mentioned in merge request !15 (merged)
mentioned in commit 29dbf519
mentioned in commit 718e605c