Fixes #1682 (closed)
Follows !196 (merged) merged too early because of an issue with unit server tests.
This will create a new commit in order to revert the existing changes.
