Revert "Backport to 1.4.7"

This reverts commit 6085e784c216c893f50c23d21a97db92f58a97d2.