Revert ASM changes to fix reboot issues

Also fix a possible memory leak on the SLUB memory allocator.

Change-Id: Iac5445ea8df1415b1182b467174310a36c7d6ede