Revert a compiler warning fix from ea6a5a6.