Actually I'm not sure about the background of these three lines added by Sriram. I'll remove them in this patch.