revert fix for bug #2931216