Revert "Switch to display Caf"

This reverts commit b26d6b1e5dcfc6d60617d9ca615267b6d5e59f5b.

Change-Id: I95f5b4fe3b37679dacebce29f55ffb0f49b00f27