Issue #2691 fix which in reality leads to NPE was removed.