To inline with changes from https://github.com/hrydgard/ppsspp/pull/5951