Fixed improper merging of last two commits.