Partially revert #6934240e202

We do not need demo environment identification as point in time branch
is now merged