Fix busted cherry-pick. I should compile before committing.