Revert "Merge branch 'fix_ticket_981' into 'master'"

Given the issues further raised in the discussions of ticket #981, it is decided to revert merge request !1475 (merged).