Gah, checked in merge conflict.