LPS-41685 revert latest changes to fix single portlet publication in staging