Revert e2945ac..814fbf7

This rolls back to commit e2945ac852b64f5c13fee4bb7971a698f560353b.
Revert 198ffeb..e7902d5

This rolls back to commit 198ffeb1261b1b92c4a8260e360d8d787e5e705f.