Revert "Add spin loop to mutex, overhaul monitor" am: d56f7d1086
am: 50b134b74f

Change-Id: I4056f54277e8d7a8c8691dbefd3fe8be65d7ac91