Revert 0a03325..e4080ff

This rolls back to commit 0a033251c8e7e09335df8a03b2bd85e536184eef.