rollback to the naive calculation
Merge branch 'walport-water' into testing