Restored chafes that were lost in merging.