[Shobhit] reverting upstream merge