Revert f885c90..73780d9

This rolls back to commit f885c909a7cdc14144815dec8ccbfe1c1f98d96d.
Revert 73780d9..374423a

This rolls back to commit 73780d9a6d4635e6be98a755b9ff3dc1101e2098.