Regression fix #2304

Temporarily revert it for now and looks like not helping other game yet but broken Naruto Ultimate Ninja Impact , we can definitely improve later .Hope @unknownbrackets fine with it for this time being.