Revert "Merge branch 'master' into api_2_1"

This reverts commit 9195d684aa5382b1c89f126a09ade9b950388692, reversing
changes made to e47de50cd98e1f8d1b3c59b7429e84fa0bf691da.