Removed in '9-branch'
