I'm not sure about the benefit of this change. If it's only for removing the warning message, I don't think it is worth it. Supporting multiple platforms is already a headache task.