Removed -f per EUCA-6498