Replace old device override hack