Back out dfdb4c5de46a801d332b67bb5981bd3b247a33d5

This was was breaking I/O Vecs, but wasn't a strictly necessary change.
We can revisit naming of ROM inputs later.
Merge remote-tracking branch 'upstream/master'
Corrected script to use bash features.