Revert "LPS-35643 because opensocial-portlet cannot regenerate with this change, when you have the fix, please revert this commit and then apply your fix in the next commit"