@tacaswell - I think we should try to add a test case (hopefully it will be quite straight forward) which exercises this code path.