Remove unnecessary lines added for
ef58eb06360e9df74faea2859a38b0b7376539ed