Why not take a snapshot image of the base install and just revert to that?