Revert 3d3aaf0..62ca1cf

This rolls back to commit 3d3aaf05683bc799cfb4722757e5922b86d47e8e.
Revert bf398d9..2134d62

This rolls back to commit bf398d978e8fe355d3b896808bcc0013c95fe0ca.