no need for a test-only tweak anymore