Revert ""Try to fix build, fix display_settings.xml"

This reverts commit 1dcf61cf67ba76e2b903f189263effa7a8857c4b.