WL-3444

Like I say, this method is a good candidate for a private method in this helper file.