Implement workaround for #190

@pjz has a fix for fabricate but we can't wait for that and I don't want
to fork fabricate in our repo if we can help it, which we can.