Working on #2817.