Working on #3057.