Revert unintentional commit from r194477.