Revert "Merge branch 'bundle-scripts'"

This reverts commit 0a18b73147b4da70943d4c3f8653be24a6ed9efc, reversing
changes made to 65696bfd69a4a0f6a401a6ab7d516d98726d2c67.