Additional change for the ff0ec1d9db6d51efa4e6baee1fa198ec5ea14e38 commit.