Back out "Substantial changed to ClassType and Status and logic on
Contact" as more discussion required