Revert "Skip 2nd measure pass whenever possible"

This reverts commit e8fb03c05899c00f55ab1990e1b16038e82d1167.
1 file changed