LPS-43772 rollback LPS-41388

Please check the detailed fix explanation from the below link
https://issues.liferay.com/browse/LPS-43772?focusedCommentId=409782&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-409782