Revert bf1fb21..839fd98

This rolls back to commit bf1fb21bf0a5135c6aad93ecb7cc3dcd00e5a0a3.
Revert 839fd98..19d4e0e

This rolls back to commit 839fd985cee33078ff12f879526fddef8ca42660.