LPS-43772 rollback LPS-41388

Rollback LPS-41388, and fix the LPS-41388 in liferay-portal. Please refer to the fix from https://github.com/hhuijser/liferay-portal/pull/1734

Rollback LPS-41388 reason: https://issues.liferay.com/browse/LPS-43772?focusedCommentId=409782&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-409782

Please help check it

Thanks,
Hai