undoing changes made as part of bootstrap upgrade