Revert "Merge branch 'master' into move-unauthorized-request-from-comments_spec-to-shared"

This reverts commit 575d9f2798ee06448d6df2ec33d65e22183824f3.