A temporary workaround for #8018 that avoids any chance of compatibility-breaking...