Turns out monitor-exit *can* throw... Need to investigate This reverts commit 8f8ee680. Change-Id: I8b42690918833c917b6a7fc3ceea932b7c1a6f15