Reapply Update 3.0.0.4 during Update 3.0.0.5