existing implementation broken since last update
(from redmine: issue id 752, created on 2018-01-22tgradl)