Import commit env in the right place