Call original first and get rid of .align