Revert "Merge branch '6.2.x' into 'BS-600_OrderTasksInCaseView'"

This reverts commit 840a0c3fa93a502a4a61225619b6e0d64ccd1b7a, reversing
changes made to 8249240e5b65e842e8a539ee4fe2d39d4b7bd2e0.