Revert 1f340a4..7e1d99a

This rolls back to commit 1f340a4a0a4f8d962eb8b6fa90699422e335d038.