Working on #2977.