Are you sure that change is in the AOSP source? It could easily be part of the Google Apps bundle instead (in which case reversing it would be trickier).