This reverts merge request !2
mentioned in commit 1c6d4872
mentioned in merge request !4 (merged)
mentioned in commit 6c841001