revert patch from bug #4532 until CPU consumption problem can be resolved