Revert "Revert "Revert "Try a new redirect mechanism."""

This reverts commit a1165e6bb44546f70982e1fbe08e01a2b3fdadc9.