Deconfliction of merge.  Not sure why this didn't go with previous commit.