LPS-43392 rollback LPS-23374

please see the reason why rollback LPS-23374 on https://issues.liferay.com/browse/LPS-43392