
            Revert the remainder of performance measurement changes

4e24b96