Revert common changes for id validation

6 jobs for !157 with gcp-tags-records in 40 minutes and 7 seconds (queued for 27 seconds)
latest merge request