Merge changes from cybertiger:master
Revert "Merge changes from cybertiger:master"

This reverts commit b1f65fcdae1aba599aab701ae6cea15364336b42.