This reverts commit 49eee842 as it caused a regression with test mirrors. Backport of ce737ac6 from master