Self review - revert part of previous fix and add a trivial change to test utility.
« Back to merge proposal
Self review - revert part of previous fix and add a trivial change to test utility.