* Fixes NB#92411, remove redundant if's