Water more than 1 level deep doesn't refill correctly

If you take water from the middle of a lake or ocean, currents stay behind.

What I expected to happen was...:
Water forming a source block in place of the taken one, as long as 2 sources are adjacent and a source is below.

What actually happened was...:
No source block is formed, currents stay behind.

Steps to Reproduce:
1. Take water from the middle of a lake or ocean.
2. Observe ugly currents.

Why I believe this isn't intended:
At the place in the source code where the decision to form a source block takes place, there is a condition which in its current form makes no sense at all (see attachement). I'll paraphrase:

If this block is a water block and has 2 or more adjacent water sources, then:
1. If the block below is solid: make this block a source block.
2. If the block below is water and this block is a source block: make this block a source block.

Number 2 is obviously useless and should be:
2. If the block below is water and the block below is a source block: make this block a source block.