Revert ffcccb9..3b10459

This rolls back to commit ffcccb9a47b1408868f79500a1f098eca0f5155c.