[TECHNICAL-SUPPORT] LPS-49600 - Simpler fix

https://issues.liferay.com/browse/LPS-49600

Relates to https://github.com/sergiogonzalez/liferay-portal/pull/1628