Revert "Merge pull request #12435 from zacc/bug917523"

This reverts commit 3ca1ab7595d79f5a3b8351ed1c2a4fdaa664404b, reversing
changes made to bdb0cbb93224aa1f09afeb9c7a7fc3a66c61d28d.