Revert "Merge pull request #21461 from guilherme-pg/bug1035321-handle-accuracy"

This reverts commit d46332fbf16a683a7a29ad3c78d865ca1767d354.