Revert 73e1604..9daf468

This rolls back to commit 73e16040bb82f08dec812d0c49d1a16f62af64e7.
Revert 660f04f..f80c8b8

This rolls back to commit 660f04fdfb9e6cc779f014d2e782c9a5e0d50fc3.
trans