revert most of recent changes in AbstractMetric

see issue #140