Revert to state before I tried replacing assembly with C