Revert "Sync with original"

This reverts commit 0c182f5b6824c41ee3cb9bad8b5b54f4fc9bcf58, reversing
changes made to 58cee32e0999afd4a2cc6edd458297e9254e976f.