Follow-up to r56683 - unnecessary abstraction