This shouldn't have been removed