Revert "Revert "Revert "Changes after additional testing"""

This reverts commit 8ce8be8f764587564d6cc8276e2672d364771fdb.