Removed downcasing for now