Fixing the modifications requried on master branch. Things should be back to
normal now.