Merge pull request #304 from sampritipanda/fixes

Revert Emergency Fixes