Merge "Revert "Revert "Fixed installation time regression when compile."""