Revert 49e028a..1f9df53

This rolls back to commit 49e028a27d0216156fdb0a150cca8e7ce39f6b97.
Revert 10a27b9..8b5d8dd

This rolls back to commit 10a27b957b6355aa81b8f0bae39115f3ef2aa12c.
latest