Revert bd9e2fc..bbb97b3

This rolls back to commit bd9e2fc9ce2d78cbdc6f36922b97b9b6d841e095.
Revert bbb97b3..3260beb

This rolls back to commit bbb97b3f2388e04d9c61ee51872dca3543301872.