New bootstrap to work with buildout 2.2.0