Revert 6619b3a..6018be5

This rolls back to commit 6619b3af177d9365a95476f9bb389acc1711dc8b.