Manually applied #234.