[#252] Revert AKVO_NS change
Merge pull request #651 from akvo/revert/252_akvo_ns

[#252] Revert AKVO_NS change