This reverts commit d4803e4a. This commit reintroduces the problem that its precursor was reverted for and merged without adequate time for review.
mentioned in merge request !157 (merged)
mentioned in commit 3677d012
mentioned in commit 4195dd40