Oops, left a little bit of merge mess in the file.