Revert "Consolidate scripts"

This reverts commit 8f18acfd2d91e1f35671f36552a669eb45754433.