* commit 'e118c1de0037e6732b66b9f52903567caa961c31': Remove dangerous and useless optimization Bug #5525888