Reverted merged OTRS Sag1029649 solution (commits 39d3b92 and 2dd4741).

It wasn't ment to be on master yet.