Re-add our own workaround because metastruct workaround doesnt seem to work