reverted - my tests shows that I can live without this change.