LPS-41059 Revert changes
LPS-41059 Prevent null pointer when a layout with plid='plid' doesn't exist