Revert eb8fc40..96aaadf

This rolls back to commit eb8fc403a686bb8c0f1050a891bcb5c09557311e.
Revert 96aaadf..13b01a0

This rolls back to commit 96aaadf579b3de2b4f49d73cbbc6f8e3e306d17a.