Revert "Fix testcase for attribute ordering."

This reverts commit 997c6516ca161073a1d516ebca7c0ca7722f64e2.
Revert "Fix testcase for attribute ordering."

This reverts commit 58f20a3cbfca7384fe5e25e095f18572736a4792.
Revert "Simplify the attributes '<' comparison function."

This reverts commit 82c101153fe7b35bce48781fab038e1b8f31a7bd.