Revert 335ff01..97239f2

This rolls back to commit 335ff01f88d7a5fa058f199de754b8c888b5ac92.
Revert 97239f2..9940f29

This rolls back to commit 97239f292803fc0ff9ec2c565c940300e345aa97.