Fix the brokenness.

@bmizerany This is ad hoc. Feel free to fix it in a more elegant way.