INFRA-593: take 2 update.

The first take 2 was a messup, I hadn't moved the new files over from
the scripts folder.