PIM-1752: Remove regression