Merge "Remove a tautological #if guard."