This reverts commit aa1f9058. The flag -codegenprepare maybe causing failures. Reverting this to investigate the root cause.