Revert partialy "galaxys2: add AdvancedDisplay"