Revert "Merge branch 'master' into endpoint-experiments"

This reverts commit d61b3a8325bca45aa972b1ba8358bc9e8ccb863a, reversing
changes made to ad2a4e74113124efb8c0bb084412a00179c75f99.