Alin, Reverting this commit on tip of master does not give me any unit test failures. When you say there is more to it, do you mean that this commit actually exposed some other bug?