Reverted to old scripts