Revert 6f2f834..0815222

This rolls back to commit 6f2f8343d015dc89f80e150cfb96d1788158011b.