Follow-up r103915. The @fixme of r103865 was wrong.