Reverted changed behaviour of deviation_of