Revert "#1025 backport"

This reverts commit 3fbd54f9c70db2091a811a0f331b1f992a0997ce.