Revert 3 commits that were accidentally cherry-picked to stable branch