Revert^4 "Add spin loop to mutex, overhaul monitor"
am: 65c18a21e7

Change-Id: I5b524df747a732f14aeedde6a40c03f6ac5f678e