Why do we still have this code path? It should not exist anymore.