Reverting some changes which got carried here from develop branch.