Revert "Fix bug reported by Thibault" - was actually correct after all (silly me)

This reverts commit fff18a8239877b3ccfc875e7b309252303b46a41.
Reference for Bar-Yossef et al.