Revert 7cb0eef..e0c0295

This rolls back to commit 7cb0eef8e8482fdaa0f6c77291d8e992aad14154.