Abhinav/Jigish: Reinstating some code that is required.