TODO this seems like a mistake, need to decide if we are reshaping or not and remove this comment either way