Removed bits leftover from upstream merge conflicts.