Revert "Merge branch 'WEB-2846' into CoreProduct"

This reverts commit 32799fb5f64abb31851ec0b6bb7e4416c23b9dff, reversing
changes made to d047c4c77894f243c696b9ea76f308251dc0b178.