Revert "Merge remote-tracking branch 'origin/display'"

This reverts commit 46aef9e50fd43b8200d6563f99e09aad312b6f55, reversing
changes made to 588a0711b4aa91ba34575e887c9ef2979b77056b.