Revert 8e2a3c6..57b2821

This rolls back to commit 8e2a3c6455707c58561b23a2e0346b571496934a.