Issue #2178795 follow-up by tim.plunkett: Fix conflict with recently committed patch.