diff --git a/video/i386/pc/vbe.c b/video/i386/pc/vbe.c
index ad87aa441..714f7397e 100644
--- a/video/i386/pc/vbe.c
+++ b/video/i386/pc/vbe.c
@@ -158,10 +158,8 @@ grub_vbe_set_video_mode (grub_uint32_t vbe_mode,
 
   /* Try to set video mode.  */
   status = grub_vbe_bios_set_mode (vbe_mode, 0);
-#if 0
   if (status != GRUB_VBE_STATUS_OK)
     return grub_error (GRUB_ERR_BAD_DEVICE, "cannot set VBE mode %x", vbe_mode);
-#endif
 
   /* Save information for later usage.  */
   framebuffer.active_vbe_mode = vbe_mode;
@@ -258,10 +256,10 @@ grub_vbe_get_video_mode (grub_uint32_t *mode)
 
   /* Try to query current mode from VESA BIOS.  */
   status = grub_vbe_bios_get_mode (mode);
-#if 0
+  /* XXX: ATI don't support get_mode.  */
   if (status != GRUB_VBE_STATUS_OK)
-    return grub_error (GRUB_ERR_BAD_DEVICE, "cannot get current VBE mode");
-#endif
+    *mode = 3;
+  //    return grub_error (GRUB_ERR_BAD_DEVICE, "cannot get current VBE mode");
 
   return GRUB_ERR_NONE;
 }
@@ -391,14 +389,15 @@ grub_video_vbe_setup (unsigned int width, unsigned int height,
           break;
         }
 
-#if 0
       if ((vbe_mode_info.mode_attributes & 0x001) == 0)
         /* If not available, skip it.  */
         continue;
 
+#if 0
       if ((vbe_mode_info.mode_attributes & 0x002) == 0)
         /* Not enough information.  */
         continue;
+#endif
 
       if ((vbe_mode_info.mode_attributes & 0x008) == 0)
         /* Monochrome is unusable.  */
@@ -416,7 +415,6 @@ grub_video_vbe_setup (unsigned int width, unsigned int height,
           && (vbe_mode_info.memory_model != GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR))
         /* Not compatible memory model.  */
         continue;
-#endif
 
       if ((vbe_mode_info.x_resolution != width)
           || (vbe_mode_info.y_resolution != height))