Revert eb82095..1c3c301

This rolls back to commit eb8209567692b3a4fb031fb851a3909d03d06f37.