We need this to make the discoverer EOS as soon as possible. Fixes #575356
mentioned in issue #350 (closed)