Rollback the fix for bug #17286