Remove bad merge code from develop. Refs #7636.