Revert 68d4acc..d3f5b62

This rolls back to commit 68d4acce79804107a4dcda5fcf8f747d185e681e.
Revert d8476cd..cc6fbdb

This rolls back to commit d8476cd946648395dd7f0892ea9df9aa7f8662f1.