A repair script for #2663

#2663