Revert "Simplify the attributes '<' comparison function."