am 2a62b43e: Merge "Remove persistent behavior"

* commit '2a62b43e671ef893e606292e82bc9fb9a09a3bf5':
  Remove persistent behavior