Revert^2 "Add spin loop to mutex, overhaul monitor" am: 3d52abe40e am: 40547f0bb9

Change-Id: I7ebda0fef695aa45703e2a6f424dc71f139fdcb2