The comment here doesn't make sense with the new code. This change can be rebased from master as of 4667a6884e5d2f126fb78d5e747b30a8dba22e82.