Revert 0e22911..28490e1

This rolls back to commit 0e22911b7f957dc43b7a28f3c0ffda0f646c8c59.