This reverts commit 2172f360
merged
By Lukas Krupcik on 2017-01-27T07:35:43 (imported from GitLab project)
mentioned in commit 35f4dca9