[#252] Revert AKVO_NS change

@zzgvh Can you check / merge?