Removed in '9-branch' but modified in '9'
