Removed merge cruft.