Revert attempted hack around regress/forwarding.sh test failure, since it doesn't seem to help.

2 files changed, 7 insertions, 3 deletions

diff --git a/debian/changelog b/debian/changelog
index afa1af616..532f90460 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+openssh (1:7.4p1-3) UNRELEASED; urgency=medium
+
+  * Revert attempted hack around regress/forwarding.sh test failure, since
+    it doesn't seem to help.
+
+ -- Colin Watson <cjwatson@debian.org>  Sat, 31 Dec 2016 01:22:48 +0000
+
 openssh (1:7.4p1-2) unstable; urgency=medium
 
   * Attempt to hack around regress/forwarding.sh test failure in some
diff --git a/debian/tests/regress b/debian/tests/regress
index 02b8658bd..846482d62 100755
--- a/debian/tests/regress
+++ b/debian/tests/regress
@@ -29,9 +29,6 @@ fi
 cp -a . "$TMP/tree"
 cd "$TMP/tree"
 
-# Attempt to hack around test failure in some environments.
-sed -i 's/^base=33/base=34/' regress/forwarding.sh
-
 # We aren't actually going to use most of this build, but we need a basic
 # build tree in place in order to be able to build the regression tests.
 autoreconf -f -i