am 94033577: Handle reconfiguration properly.

* commit '940335776b6d4eb91b13c4e56bc20bed3ac0011b':
  Handle reconfiguration properly.