Revert "fallback to original display-caf"

This reverts commit a2eb8f7381836b00db9f442f634990755955230b.
change branch