Re #6366 Cutting code duplication