Committing as this is required for tests to work in #3142809: Add a unit test...