I think that fix was reverted by Walter due to failing test-cases.