Another approach to fix bug-524388-2.