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

Change-Id: I708ca7c7e9b8991abead35fbafc513e8aea6415a