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

This reverts commit e36b02183285a70b784dfde80f08baf326fe7590, reversing
changes made to 7d7b780a363ab75dd7b0c28958f47046444d0ca0.