Revert "script: Use atom comparison in more places, especially for attributes." for persistent test failures.

This reverts commit 874db261046d6155b1942efa106d2e0014295d6d.