This and below match changes in mozilla/flue#18