This reverts commit 421db106da4724aee16274ecfb818713e3ac61d7. We cannot easily change this on the fly anyhow.