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

Merge commit '42b68d1aef220145fc7c06ca469d2693e96e9801' into kraken

* commit '42b68d1aef220145fc7c06ca469d2693e96e9801':
  Revert "Plug leak in class initialization."