R=rsc https://codereview.appspot.com/6854130
Probably not the right fix, but gets us going. R=rsc http://codereview.appspot.com/6782113