Removed the force option #6444