Remove code that was merged incorrectly.