Taking out Airstream reference for now.