am 818164b8: Revert "Plug leak in class initialization."

Merge commit '818164b87a9c08a938c371d8b47987a3af06d6f6' into froyo-plus-aosp

* commit '818164b87a9c08a938c371d8b47987a3af06d6f6':
  Revert "Plug leak in class initialization."