[BUG #8235] Reverted changes of SHA  65d447cf299ec2930642c5b66266b8956d4b4f49.