re: is this really needed? No workaround? Can we mark it as `@private` if it's a hack?