Implement PR2206.