Merge "Revive old method to prevent crash internal app."