Revert "Fix test failure"

This wasn't the right fix.

This reverts commit 7a49dbf5d8fd84c9502419b59c58e4053ecaa725.

Change-Id: I5c6c2a82424ad81771273f87e1b1ea98fba05922
Revert "Fix test failure"

This reverts commit 9446581e9eb0843f20f504543736b498a48fb909.

It wasn't thr correct fix.

Change-Id: Id13e344e0ec3b0f5474bfcb88f7e0489df3edd94
Merge topic 'value-rendering' into master

bee44340 Revert "Fix test failure"
fbb98292 Revert "Fix test failure"