Revert "Fixed PIM-1374"

This reverts commit 3b329e1d917a9e8fe1244e2cbc2d5db9fde2747f.