This reverts commit d96c1356, reversing changes made to 583bb40f.
mentioned in merge request !188 (merged)