Attempt at fixing the issue raised in r82948.