That patch was fixing a little bug, but makes another bigger one.
The previous patch fixes both.

This reverts commit e687a58f.