Revert bug searhing change