Revert 6f43f49..3daa8db

This rolls back to commit 6f43f49fa3cad3efddd92869589619d1bc791977.
Revert bab00a6..79cb4c1

This rolls back to commit bab00a6592628cab007958e8e66f59d21c368563.