This code is already in master..?? (as is a fair amount of other code said to have changed in this class)