reconcile with iwehrman's cleanup in #3202