Revert eebae44..d7762a8

This rolls back to commit eebae44cd3c3a59b67a6d5bd546bd2a6466b6f54.
Revert d7762a8..193609b

This rolls back to commit d7762a8d98895f6e6b1eb3aeefb5bc0e47f104e2.