Revert "Merge pull request #11777 from evanxd/bug-863999"

This reverts commit f56f364d7af0409729954748122d9e38a6480e82, reversing
changes made to eb48d3682e045c94b650323b5a55898afdf3e3b1.