Revert "measure only the current k-tuple"

This reverts commit 98123b0f4d957e3c2acfc1cf8252fe1f4d4fbd25.