As it turns out, this line can simply be deleted.  Merging a change for this now.