Revert "Partial Update to 1.8.1"

This reverts commit 4c9ecf47d94e21cb71f0f16ba0dfc004a08319e4.