Revert earlier changes for now
Update scripts