Even with the new Akka 2.2. Props swapping the lines would of course not help.
Do you see an easy fix?