Are you sure nothing else relies on this code other than the image upgrade?