Rolling back change to values().  Introduced test failures.