Revert 2680060..e77cde2

This rolls back to commit 2680060b82b878c23ec510b1195ca5f84d4e476d.