LPS-48834 (Temporary fix) Keep original logic that was broken by b7f1edbdf52e0fd5b545a0541f1671a8ee2d75f4 and its review

cc/ @cgoncas