diff --git a/ChangeLog b/ChangeLog
index 3bd5d0f85..12e48e9f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/kern/emu/full.c (grub_emu_post_init): Remove raid reinit.
+	* include/grub/disk.h [GRUB_MACHINE_EMU]: Remove now useless LVM/RAID
+	declarations.
+
 2012-02-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/emu/hostfs.c (grub_hostfs_close):
diff --git a/grub-core/kern/emu/full.c b/grub-core/kern/emu/full.c
index 1ecd34f7d..6bc600bc2 100644
--- a/grub-core/kern/emu/full.c
+++ b/grub-core/kern/emu/full.c
@@ -69,12 +69,4 @@ grub_arch_dl_init_linker (void)
 void
 grub_emu_post_init (void)
 {
-  grub_lvm_fini ();
-  grub_mdraid09_fini ();
-  grub_mdraid1x_fini ();
-  grub_diskfilter_fini ();
-  grub_diskfilter_init ();
-  grub_mdraid09_init ();
-  grub_mdraid1x_init ();
-  grub_lvm_init ();
 }
diff --git a/include/grub/disk.h b/include/grub/disk.h
index ca46f031e..096173d9b 100644
--- a/include/grub/disk.h
+++ b/include/grub/disk.h
@@ -194,7 +194,7 @@ EXPORT_FUNC(grub_disk_cache_get_performance) (unsigned long *hits, unsigned long
 extern void (* EXPORT_VAR(grub_disk_firmware_fini)) (void);
 extern int EXPORT_VAR(grub_disk_firmware_is_tainted);
 
-#if defined (GRUB_UTIL) || defined (GRUB_MACHINE_EMU)
+#if defined (GRUB_UTIL)
 void grub_lvm_init (void);
 void grub_ldm_init (void);
 void grub_mdraid09_init (void);