Rerolling pr for #2710

#2710