Broken from #2168.

I must have been half-asleep last night or something (or maybe travis wasn't doing its job?).