This reverts commit 49eee842 as it caused a regression with test mirrors.
mentioned in commit 8a03102f