[DF-2672] Revert some changes for defect. Need deeper investigation for memory usage of loadingtransitions.