This reverts merge request !497 (merged)
Needed because BE has been reverted
merged
mentioned in commit 063b5ba5