Here comes the buckets (bug 821114)