#3872: Remove conditional