Rolled back to CBMC 4 6