
This fixes and re-lands 4bb7496b6243b13e14712b3b5702928c831a329f, which was reverted in ceade39c83cf0832b53c4e0fbf17eee6081201ca due to test failures caused by a bad rebase.
This fixes and re-lands 4bb7496b6243b13e14712b3b5702928c831a329f, which was reverted in ceade39c83cf0832b53c4e0fbf17eee6081201ca due to test failures caused by a bad rebase.