Revert "axmap: fix deadlock"