Adapting back to buildenv