Back to rendering the view in PBS

Change-Id: Ie3f620104c5ff9f3fcae1456e2e5cf93ecb7c495