Now start to rein it in

There's a deadlock occuring in here somewhere that resolves itself upon
client timeout.  Obviously not ideal.  A refactor of the way logical ->
physical mapping is done may make the necessary lock points more
obvious.