Revert 9c5fd8f..9f9925d

This rolls back to commit 9c5fd8ffd3a0495aab3dead7d272c2d7faa9e9d5.
Revert dabeb03..be73a8a

This rolls back to commit dabeb038f0a476fa41b17318cb65c7f479733d23.