Revert 3f8999f..95b30bc

This rolls back to commit 3f8999f0c24e96d7dacb46dd337f9800aff43d71.