I broke the build.

Hello @nicks, @x-ma, 

Please review the following commits I made in branch 'nathan-noContext'.

d52505c2d4275eadf7d22fd063ec8ad981fa6d77 (2014-09-29 10:20:04 -0700)
I broke the build.

R=@nicks
R=@x-ma