diff --git a/debian/changelog b/debian/changelog
index 642c99ff..e80cb58c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.318) UNRELEASED; urgency=medium
+
+  * merge lp:~sergiusens/livecd-rootfs/no-walinuxagent to remove all the
+    hackery that was initially needed for azure snappy images, this got
+    properly implemented now.
+
+ -- Oliver Grawert <ogra@ubuntu.com>  Thu, 25 Jun 2015 13:59:50 +0200
+
 livecd-rootfs (2.317) wily; urgency=medium
 
   [ Sebastien Bacher ]
diff --git a/live-build/auto/config b/live-build/auto/config
index e07c288f..334fa275 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -386,13 +386,7 @@ case $PROJECT in
 			#add_task install minimal
 			add_task install ubuntu-core
 
-			# add special azure package
 			case $ARCH in
-				amd64)
-					# will be removed later when the azure
-					# specific device tarfile is created
-					add_package install walinuxagent
-					;;
 				i386)
 					# efi support can go once the task
 					# header is available for grub-efi-ia32-bin
diff --git a/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary b/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary
index ab19b2e5..3d02b99b 100644
--- a/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary
+++ b/live-build/ubuntu-core/hooks/500-move-kernel-to-device-tar.binary
@@ -71,28 +71,10 @@ fi
  tar -c -z -f $HERE/device.tar.gz system assets hardware.yaml
 )
 
-# now build the azure device tarball by adding walinuxagent
-if [ -e binary/boot/filesystem.dir/var/lib/dpkg/info/walinuxagent.list ];
-then
-(
- cd binary/boot/filesystem.dir 
- while read line; do
-     line=$(echo $line |cut -d/ -f2-)
-     if [ -e "$line" ] && [ ! -d "$line" ]; then
-         cp -ar --parent $line $TMPDIR/system
-     fi
- done < var/lib/dpkg/info/walinuxagent.list
- # created by walinuxagent postinst/dh-systemd
- cp -ar --parent var/lib/systemd/deb-systemd-helper-enabled/walinuxagent* $TMPDIR/system
- cp -ar --parent etc/systemd/system/multi-user.target.wants/walinuxagent* $TMPDIR/system
- mkdir -p $TMPDIR/system/var/lib/waagent
-)
-# and tar it up
-(
- cd $TMPDIR
- tar -c -z -f $HERE/device-azure.tar.gz system assets hardware.yaml
-)
-fi
+# now build the azure device tarball
+# this should go away once we have a custom grub.cfg for azure
+cp $HERE/device.tar.gz $HERE/device-azure.tar.gz
+
 rm -rf $TMPDIR
 
 # remove files from the root filesystem
@@ -105,8 +87,4 @@ rm -rf $TMPDIR
  rm -f vmlinu?
  rm -rf lib/modules
  rm -rf lib/firmware
- # remove walinuxagent
- if [ -e var/lib/dpkg/info/walinuxagent.list ]; then
-     chroot . dpkg --purge walinuxagent || true
- fi
 )
diff --git a/live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary b/live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary
index ab19b2e5..31c6092f 100644
--- a/live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary
+++ b/live-build/ubuntu-desktop-next/hooks/500-move-kernel-to-device-tar.binary
@@ -71,28 +71,6 @@ fi
  tar -c -z -f $HERE/device.tar.gz system assets hardware.yaml
 )
 
-# now build the azure device tarball by adding walinuxagent
-if [ -e binary/boot/filesystem.dir/var/lib/dpkg/info/walinuxagent.list ];
-then
-(
- cd binary/boot/filesystem.dir 
- while read line; do
-     line=$(echo $line |cut -d/ -f2-)
-     if [ -e "$line" ] && [ ! -d "$line" ]; then
-         cp -ar --parent $line $TMPDIR/system
-     fi
- done < var/lib/dpkg/info/walinuxagent.list
- # created by walinuxagent postinst/dh-systemd
- cp -ar --parent var/lib/systemd/deb-systemd-helper-enabled/walinuxagent* $TMPDIR/system
- cp -ar --parent etc/systemd/system/multi-user.target.wants/walinuxagent* $TMPDIR/system
- mkdir -p $TMPDIR/system/var/lib/waagent
-)
-# and tar it up
-(
- cd $TMPDIR
- tar -c -z -f $HERE/device-azure.tar.gz system assets hardware.yaml
-)
-fi
 rm -rf $TMPDIR
 
 # remove files from the root filesystem
@@ -105,8 +83,4 @@ rm -rf $TMPDIR
  rm -f vmlinu?
  rm -rf lib/modules
  rm -rf lib/firmware
- # remove walinuxagent
- if [ -e var/lib/dpkg/info/walinuxagent.list ]; then
-     chroot . dpkg --purge walinuxagent || true
- fi
 )