Revert 35e093c..64ba5d8

This rolls back to commit 35e093c0ba417b999f7ffcb6d1047961c841af66.
Revert 0a620b5..00ad955

This rolls back to commit 0a620b591434fe3cf3b2e74ef0e74a15d2414124.