BUG-6757: revert fix for BUG-4456