Remove commit d937eb2f21760801b6831ccd2258435a7c643698 from ashoksr_bugs branch