Revert "Merge branch 'master' into giang"

This reverts commit de4919c25a98021e28de71687964fcb4356f1d10, reversing
changes made to d6daeaa7574441a873227d5bac59fe3e51d6e7a9.