Issue #2774313 by rjacobs: Revert micro-commit from previous #2774313 merge commit to address test failures.