Revert "Merge branch 'revert-51677b07' into 'master'" See merge request !232
mentioned in commit 90dce1f7