diff --git a/YaST2-Second-Stage.service b/YaST2-Second-Stage.service
index fec9fb7..1d552cf 100644
--- a/YaST2-Second-Stage.service
+++ b/YaST2-Second-Stage.service
@@ -7,9 +7,6 @@ ConditionPathExists=/var/lib/YaST2/runme_at_boot
 [Service]
 Type=oneshot
 Environment=SYSTEMCTL_OPTIONS=--ignore-dependencies TERM=linux
-# firewall will be started by YaST Second Stage
-# ensure current queue doesn't block YaST starting it
-ExecStartPre=-/bin/systemctl stop SuSEfirewall2.service
 ExecStartPre=-/usr/bin/plymouth --hide-splash
 ExecStart=/usr/lib/YaST2/startup/YaST2.Second-Stage
 RemainAfterExit=yes
diff --git a/yast2-installation-3.0.3.tar.bz2 b/yast2-installation-3.0.3.tar.bz2
deleted file mode 100644
index 644713a..0000000
--- a/yast2-installation-3.0.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:02a41b2659788a33e3dac4fb2fb64e721f899b0a2e3aecf3232ddb67d2debab6
-size 283274
diff --git a/yast2-installation-3.0.4.tar.bz2 b/yast2-installation-3.0.4.tar.bz2
new file mode 100644
index 0000000..67d5a1b
--- /dev/null
+++ b/yast2-installation-3.0.4.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:09c17ee9de9736d168b1672aec11653d19f42fd82672c6dd32ec2451d378d049
+size 283731
diff --git a/yast2-installation.changes b/yast2-installation.changes
index c2b2bcf..08e13d7 100644
--- a/yast2-installation.changes
+++ b/yast2-installation.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Aug  9 06:36:31 UTC 2013 - mfilka@suse.com
+
+- bnc#798620
+    - removed proposed hotfix for the bug. The hotfix could block 
+    starting firewall under some circunstances.
+    - (re)starting firewall is handled in yast2.rpm since 3.0.2
+- 3.0.4 
+
 -------------------------------------------------------------------
 Wed Aug  7 12:57:05 CEST 2013 - jsuchome@suse.cz
 
diff --git a/yast2-installation.spec b/yast2-installation.spec
index ce86b0e..28a647d 100644
--- a/yast2-installation.spec
+++ b/yast2-installation.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        3.0.3
+Version:        3.0.4
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -48,7 +48,7 @@ BuildRequires:  yast2 >= 2.16.52
 Requires:       autoyast2-installation >= 2.17.1
 
 # ProductProfile
-Requires:       yast2 >= 3.0.1
+Requires:       yast2 >= 3.0.2
 
 # Language::GetLanguageItems and other API
 # Language::Set (handles downloading the translation extensions)