Bug 840698 - Activities are broken. r=cjones, a=tef+