UPDATED: A Deal on the Cadillac Tax