This reverts commit 1a28b64446114a264f87e488cf62c934a53c7015. Both extensions have PRs to revive them.