No need for an AtomicBoolean here
Revert Akka upgrade, we'll use 2.3 for M5, see #1600