Clean up: removed a nonsensical optimization.