Merge branch 'remove-machine-id' into 'master'

Readd "remove machine-id" logic

Closes #117

See merge request !141
3 jobs for master in 30 minutes and 30 seconds (queued for 2 seconds)