(partially) revert PR#98 "incompatible units"