Same changes as previous PR

It was easier to start from scratch than fart around with the various git commands.