Pulling in changes Mara made to get it to run on firehose.