Reverting last commit as I failed to include all changes in it.