Get caught up to 2.6.0, renable crash on $where so we don't forget to
actually solve that problem