This reverts commit 350b03bc. Also fixes a fault_handler symbol. Change-Id: I1315527400bffc8ded9f2a7e7fdb1c8a6c104b96