Re-Committing Nikesh's changes that got de-integrated when I made my first pull request.