convert back to akka 2.1.2