Working on #2970.