Revert cornford/bootstrapper