Revert 1354664..6cfd3f7

This rolls back to commit 1354664c5422ab5e497208a26d6791e1f713937d.