Revert "Merge branch '501694-support-correct_work_item_type_id' into 'master'"

Description

This reverts !172974 (merged) because we have corrected the original values of work_item_typs &15272 (closed) and we are in the process of dropping correct_work_item_type_id.

Related to #501695 (closed).