Revert breaks, create new script for new stuff.

Review by @adriaanm, @retronym @gkossakowski @skyluc @dotta