Attempt to revert change that broke unit tests.