Given that the intent is to fix the functional tests in a separate PR, does this change really belong there?