Backport !1529 (merged) in slapos branch
This will create a new commit in order to revert the existing changes.