Somehow one of Mark's commits got into this branch. I need to work out how to remove it again.