SCI: Replace workaround for bug #3605269 by script patch