Working on #3107.