PIM-3061 : revert