Need to update the tests for #1393.