Fixed strange merge conflicts that got pushed into 7x branch.