This code was previously present with PR #3810 but was accidentally left out during the DSL migration.