Follow-up on https://gitlab.slack.com/archives/C0NFPSFA8/p1547049400155000
cc @ebrinkman @kencjohnston