revert 63a005b92d731d57747cf5fe2d4cfb7ea7d85b1a, it needs further consideration what happens to $sth->{NAME}? The revert needed tweaking due to later bfbf3e161