Revert "Revert "Revert "Revert "Partial Update to 1.8.1""""

This reverts commit b3cf97d912ed64125c235d863811a745d003dc95.