LPS-37702 Revert as it is breaking the build
LPS-39306 revert 597e90d since this cause portlet preferences are not loaded properly