Not sure that this change (and perhaps the above) were supposed to make it in to here?