8c0b9fdfa1
This reverts commit 00bb42105d. It was
not as well thought out as I had intended and broke the build when
VK_KHR_display is disabled in the build.