Reverting last last two commits mistakenly pushed to stable branch.