Comment 11 for bug 937101

bug#830947 provides a possible fix for this patch, but since it's not clear if/when it'll be installed, here's a simpler workaround that does not require you remember the magic revno 170:

 "bzr checkout .../elpa; cd elpa; rm -r *; bzr revert"