I'd prefer if you used the same workaround here as in master, unless it doesn't work.