This reverts commit 2722bab8. This conflict with onging restructuring, will be commited again afterwards