Reverting previous change due to overhaul of script system