Revert 2cf0f95..dbc752c

This rolls back to commit 2cf0f95e4d69f30f4aabbd24b85c45553ebb2f8b.
Merge branch 'ArielQian' into version3.0