Changes after additional testing
Revert "Changes after additional testing"

This reverts commit 0ce12e365a69b7604ca64d5fd40a05a236c5672e.
Revert "Revert "Changes after additional testing""

This reverts commit 48617054df35e10d981c60875231eca459c87b11.