Revert "Merge branch 'master' into fix-comments-api"

This reverts commit 282ee93a193aa2e997afa522160644181c5a3154, reversing
changes made to 262c16dfca6feee1cca1e0e35479db16297181a1.