Revert "Bug squashing across most of the scripts."

This reverts commit 67dfca721e7dcb7e94542175981de76431ceb425.