revert unsuccessful merge of feature/issue-1668 by @kubak10