Use alexparker's fork in bootstrap