previous fix did not apply to builds without single-source env setup ci builds with it enabled at all times