PIM-2730: Revert some changes