Remove as is in #6960